jsonwrt: Integration fixups

This gets the code to build without the rest of util-linux.

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/src/libotutil/.clang-format-ignore b/src/libotutil/.clang-format-ignore
new file mode 100644 (file)
index 0000000..67b057c
--- /dev/null
+++ b/src/libotutil/.clang-format-ignore
@@ -0,0 +1,2 @@
+# Because this is imported code
+ul-jsonwrt*

diff --git a/src/libotutil/ul-jsonwrt.c b/src/libotutil/ul-jsonwrt.c
index 365d845ce91582e212e38ccb76bb6d9ece9cca5b..44339835c999efdf0e5383bc460b1646180a3199 100644 (file)
--- a/src/libotutil/ul-jsonwrt.c
+++ b/src/libotutil/ul-jsonwrt.c
@@ -9,10 +9,13 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <cctype.h>
 
-#include "c.h"
-#include "jsonwrt.h"
+// The following includes were modified from upstream
+#include "ul-jsonwrt.h"
+#include <glib.h>
+#define c_toupper g_ascii_toupper
+#define c_tolower g_ascii_tolower
+#define assert g_assert
 
 /*
  * Requirements enumerated via testing (V8, Firefox, IE11):

diff --git a/src/libotutil/ul-jsonwrt.h b/src/libotutil/ul-jsonwrt.h
index f156fdd423dcb0345c38d0d68603735aaf3fb30d..bddbe5edb7d53bafdd93f6bf4bdb9d619ae339bb 100644 (file)
--- a/src/libotutil/ul-jsonwrt.h
+++ b/src/libotutil/ul-jsonwrt.h
@@ -5,6 +5,9 @@
 #ifndef UTIL_LINUX_JSONWRT_H
 #define UTIL_LINUX_JSONWRT_H
 
+#include <stdio.h>
+#include <stdint.h>
+
 enum {
        UL_JSON_OBJECT,
        UL_JSON_ARRAY,